Merge branch 'master' of git://nbd.name/uci
authorJo-Philipp Wich <[email protected]>
Mon, 19 Dec 2011 18:10:07 +0000 (19:10 +0100)
committerJo-Philipp Wich <[email protected]>
Mon, 19 Dec 2011 18:10:07 +0000 (19:10 +0100)

Trivial merge